More errors, but fixing 'em one by one :)