- Added some improvemented code, again, still subject to change.