Added stuff. Fixed bug.