got rid of past bugs