Fixed some inconveniances