Fixed some issues and loose ends