Sync to Master + fixed some stuff