Updating to 0.8 and include some fixes