Condensed the new sources down into 30 lines again. Unfortunately, some are insanely long