Fixed some bugs, some cleanups and added gulp