Cosmetic changes. Found a bug, will fix later.