removed old comments
fixed a bug with spacing
added direct call support