Fixed the remaining bugs... Hopefully