added contributors; some cleanup;