Cleanup
Add revelant checks, cleanup, update sources