cleaned up misc