more stuff added
modified:   src/Core.hs
modified:   src/Util.hs