0.5.5 more fixes, uglier and bigger