Fixed stuff, but broke everything. >.<