Index: trunk/psastro/src/psastro.c
===================================================================
--- trunk/psastro/src/psastro.c	(revision 5360)
+++ trunk/psastro/src/psastro.c	(revision 5505)
@@ -10,11 +10,9 @@
     psMetadata *config = psastroArguments (&argc, argv);
 
-    // define optional parameters (keep in psMetadata?)
-    pmAstromOpt *options = psastroDefineOptions (config);
-
     // load the input data (cmp file)
     psArray *rawstars = pmSourcesReadCMP (&header, argv[1]);
 
-    psFPA *fpa = pmBuildFPA (header, config);
+    // simple layout interpretation, basic WCS conversion
+    psFPA *fpa = psastroBuildFPA (header, config);
 
     // limit fit to bright stars only 
@@ -31,5 +29,5 @@
 
     // find initial offset / rotation
-    stat = pmAstromGridMatch (subset, refstars, options);
+    stat = pmAstromGridMatch (subset, refstars, config);
 
     pmAstromModifyFPA (fpa, stat);