update some stuff 14/12