Some dockblock changes, minor fixes