final fixes and features