features features features packed in

to huge commits...