added logout, cleaned up files