cleaner positioning, minor fixes