HAM: Bug fixes, cleanup and a very failed attempt at custom object tracking