Bootstrap_30 updates 804pm 101013
commiting 101213 changes