Update lots of stuff added