Fixes from implementation
Final patch from implementation
Added more to description