Updated and Fixed some Functions.