Lots of updates

Forever working