Fixes #25, other bug fixes also