Forgot to commit some old changes; a bit crash, but good enough for most day-to-day use.