Comment clean up
Asset Id code, updated session management