1.8.1 Progress

A few little bug fixes here and there!