some aesthetic changes, debugging