laying out the things
small fixes