Commit Ver. 2

+ Bug Fixes (7 Fixes) - V1