minor fixes implementation
minor fixes implementation