added some general stuff