Robbies updates and some fixes