Finishing touches
Bug Fixes