Updating features. Fixes for bugs.