Little changes and bugs