closed small bugs/changes: #2, #6, #7, #8, #9, #12