fixed, rewrote and cleaned shots :)