Image cleanup
some minor changes
cleanup
Edge case shifting bugs