More bug fixes and options