fixed last minute issues