Fixes and Goat Janitor

Finished up the missing bits for Goat Janitor and some fixes for Velos.