spoilers added, bug fixes