Some last minute bug fixes and polish