bunch of various oneline fixes