I do apologise for my last commit message. This commit, like the last, fixes stupid bugs that we really should have not deployed.. however we are now faced with resolving things in a commit message unfriendly, timely manner