code fixes related to @lars comments