-type or stupidity (u choose :/)
-fixed some inconsistency