some imp fixes: put comments in code