fixup and cleanup some errors