Cosmetic fixes, changed default directory for images