Feature/mount&pet frames

add mount and pet frames
also fixes some whitespace issues