Fixed several functions and files
Added changes to changelog