more bugs fixed, big test with @Ignore