Some fixes aswell as updates

too much to know :P