refactored misc tables