lil bits of fixes