Fixed some issues, still have one more left