Small updates & contributions by Klem