Fixed #1 #2 #3 #5 #7