Some spring cleaning
Fixed errors