Fixed secondary imports, decoupled self and this
Fixed nested for loops
Version bump