url & other fixes
rebuild