Fixing some stuff, please comeback later.