Added return value to initialization methods.
- Fixed some issues