backport readme updates and bugfixes submitted to stackforge