Initial repository with some fixes