Add kanonen and hulk; add handling of high sample rates and weird units