Updates to fix some bugs and solve some issues :)