Made everything less shit and work right