+1 - not in this PR but i really would want to fix that stuff up, its quite a mess atm. see #74