Hopefully fixed some errors...