Fixed some crazy bugg