bug fixes, touch ups