fixed some marchallissues