Added Comments, Fixed NPE when closing and reopening