Last Stitches

Cleaned up some minor bugs