minor changes + preliminaries for login system