Fixed some bugs + minor updates.