fixes and reorganization
basic configuration
scrappy test program