fixed everything, should be working.. SHOULD