added a couple more features from Ng&Cardie
merged some of anya's stuff more cleanly