- Fixed format
- Fixed Doc Blocks
- Fixed Some bugs