Finished last minute touches