Fixed some minor bugs
Initial Setup