Some unsync'ed changes..

the best commit ever!