added some semi-colons
- bringing everything up to date