Added some more stuff; history; fixed warnings