Add some change and fixes