Features fix.
Some style tweaks.