Updates

#1,4,5,7,14,15,16