Core pr 5

Fixed comments...