got rid of stuff and minor changes