polished up some things, should ask for drunkedness only once