initial commit
minor bug fixes