- Fixed some warnings
- Added mode types