Update

+ Few Debugger Properties
+ Fixed Logical Errors
+ Cleaned up code