Finishing Image class functionality, small changes to other classes.