some updates (WHY ON EARTH!)