pulled some hard codded stuff out of main
minor changes