last fixes befor going live
