few changes
login rebuilt