cleaned up certain bugs.