better eval function working awesomely!

also cosmetic changes to q1- evaluation fuction for action