code improvement for better return values
second level auto completion is working
removed unsued commtens