minor bugs, changes to default settings, reorganization