Further development work
Additional fixes, both functional and performance