Added return-code colro & chagned color schema
Added extras
Cleanup