Added usage info and improved comments