made some final fixes