Various updated and new stuff