Functional fixes/cleanup

donesies good catch