fixed minor bugs
added lot of things