Last-Minute fixes and finishing