finally (finally) working

after the clusterfuck of this afternoon's committs...