Committing day's changes + quick fixes