fixing issues identified by clayton