more fixes and prettyness