added types and improved layout, added Rafael to copyright