Boxfile plus some other edits