added all stuff
design fixes