Mucked up start of auto init'ing functions, fixed bugs