Dev

updates and fixing logout