Fixing little issues

fixed a few little issues.