more updates to come, a bit of house cleaning and a few ptr vs. reference issues to cleanup after the modifications