Different fixes, changes and commenting