Fix Bugs
Fix some issues with doccomments