Some fixes... but still without work :(