addressing several issues from #13

fixed issues for uses with no button