bug fixes, prepped for upload