fixed things, jeremy don't play around with master like that