More bugfixes, implemented use of custom LockedHorse class across plugin.