space cleanup
rework some messages and do some space cleanup