Added check to go to the finish screen, bugfixes left and right
merge