added code push
fixed some bugs