Fixed lots of issue