fixed and added some minor stuff