Cleaned up, info window display, working