Made some updates, fixed bugs