Quicker Guide works, minor bugs fix