Fixed minor bugs and Larger switch.