got everything the way it SHOULD be now...