Added static data
Changed details
Added more verifications
Basic look management
Cleaned up