hacks here and there =)

...