Simple fixes of previous
Fixed compile-time errors
Fixed bug, passes tests