Just an update

#1
#5
#13