seperated session handling
replaced panics with some basic logging
Update method names