Random fixes

Works. kinda.