some small updated and minor tweaks. Still have to add conversion, code stub is there