Added some logs to application/logs - Various fixes