Updated Sponge API + Fixed minor bugs