chnaged stuff back, cleaned targets