Cleaned and added some sysouts