final fixes for patrick