Minor fix and optimization. (untested). Xtra features to add.