Updated engine & minor changes