Prepared stuff for submission, fixed bug.