fixing some problems on the live instance