tidying, no real changes
fixed some ui bugs