#121 change size
#121 fixing some little bugs