Updated Files

Added new features and Fixed some bugs