couple fixes && additions, green