fix some issues, which I didn't handled at first
added support for 0.8.3