Resolved some warnings + documentation