Commit #15 minor bug fixes