Fixed some Features