#8 Major fixes. There are many issues yet.