track origins and fix spawn position
Merge branch 'master' of https://github.com/Stormfish/Silverfish