Added better method signatures, junkdrawer