more animation fixes, added oneshots