Actually upating and some other little stuff