format improvements and different image naming