commit msg, stuff I did to make it work