Fixed small issues, more testing