Fixed some issues; added subscription capabilities