Fixing some bad doc blocks
Fixing some buggy/unexpected situations