Cleaned and fixed somethings