further edits; thanks jorgecarleitao for comments