Minor bug fixes and url changes