never been more stressed out in my entire life...but looks like all bugs are gone. FINAL COMMIT