Update at 24th of January 21-00

Updated some functions. More bugs :(