Fixed things, some improvements, mainly a backup