some stuff fixing + testing..