fixed/improved a few things