ic
ic
errors
fixes and refactorings