Updated to feature tag & misc bug fixes.