changed tons of stuff again
fixed decorators