small codefixes