Ondemand tuning! + fixes.

https://github.com/faux123/mako/commit/e48a13a0b811620d204a8ca8edf1327ab1a86002
https://github.com/faux123/mako/commit/32bd2eddd895c26cf16a27a6e6154b66e90d65d7

Thanks @faux123