Fixed issues
added all  basic functions