Fixed a couple of stupid mistakes, issue still not resolved