Slightly more stringent tests
Fixed bug regarding picking wrong enders
Updates from visualize, cleaning up and adding loading straight from file.