quick fixes. need to update more obviously