general warning clean up and better space handling