Fixing errors, everything seems to be functional now.