Fixed small bugs, removed logging