Little more fixes and improvements...

...and now haxelib points back to you again. I will submit this to haxelib and follow with necessary bug fixes but atm i think i'm finished with this :)