Some small fixes & removing misc garbage.