cleanup extra spaces, fix padding on models, misc cleanup