Cleaned and fixed minor stuff.