Fixed all that needed fixings :(

Should all be working now~