fixing 2 little bugs