Updated documentation, small implementation update