syntax
bug fix and cleanup
worked out the bugs