Added full comment support
Fixed some non-static variables
Fixed tests again