Some methods updates and documentation