Some bugfixes, new added functions
Different changes