Updated gotos and bool support