Updated checks to be more meaningful
Added new libs