multiple bug fixes and change the way images are handled

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>