added combat, adjusted image sizing
complete with bugs