cleaned up final bugs