Fixed some warnings
Improved documentation