fixed stuff... yay