cleaned up bugs