Minor tweaks and test. V0.9