merge of saladz
latest clean-up