some magic
final fixes