Removed extra rubbish, updated some stuff