Popravljeno 8 defekata

#6, #41, #52, #53, #54, #55, #56, #58