[UPDATE] Minor fixes and debugging output removed.