Added some general stuff.