cleaning up hammer stuff and testing nav mod