Cleaned up directory and made final fixes.