final fixes from develop