Add Fiddlesticks, also misc cleanup stuff