13-11 Update

Long time ago since an update, loads of bug fixes and a few new things