Fixed small errors, still not working.