More bug fixes, lots