Implemented proper quoting, fixing mergesort and map etc. - also, new unit tests!