Fix issues. Shit somewhat faster.