Last commit for now, updated some info