More work on some stuff and removed stuff I didn't need from buildcraft