Fixed a lot of details