Fixed bugs and changed design.