fixed issues 11 and 6

fixed 'em good