Improvements (bad commit comment, I know ;))