lots of new stuff with feature command, some psr-2 stuff