last few changes in design and stuff