Fixed some stuff in hack branch