bunch of updates and :shit: