Minor updates, debugging, main