Improved monitoring and fixed some issues