Fixed small issues. Added more.