fixed major junkie bugs