final fixes *sigh*