how oabout more fixes, :)