Majorly fixed bugs

Everything was wrong. Now it's not