Updated Project With Bug Fixes