We actually just fixed part of 1 and 2 completely in a new build! (For now only available on our github since files are locked).
Glad you enjoyed it!