updated general stuff