Finally got everything back at where it should be..