misc. fixes and additions

Just ask Cody what the hell is going on...