Fixed bugs and added more fields