adding final fixes