Minor bug fixes, alerts added