significant image updates and code changes to make everything line up correctly