Took a step back, code reviewed myself. Found some stuff.