Updated with bug fixes
comments