Updated everything and added several function, bugs fixed