Adding accepted answer functionality, other fixes