settled all issues; added more options; final tests for merging into production