Added repository and fixed some issues