fix some minor issues
fix some more bugs