Add Dependencies & fix minor bugs