Again some improvemets and bug fixes but still buggy