Minor bug fixes, display and vacation mode wierdness