fixed bugs, changed design