Fix ALL THE ISSUES!