BLAAAAH fixing more errors