Minor improvements, bug fixies but import bug pending