new init file
cleaned up a bit to account for pending bug #281
Merge branch 'new_init_file'