Updated almost everything and added new stuff