Moar bug fixes, update setup