Fixed syntax errors and added some functionality
Same