Version 0.89k

Merged in dc42's latest bug fixes, but not tested yet