Add octocats
Updates and cleanup