first push, some fixes still to do