added 5 bugs from @bertoom