Fixed some minor bugs
Initial setup